Skip to content

Rollup of 7 pull requests #107928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 17 commits into from
Feb 11, 2023
Merged

Rollup of 7 pull requests #107928

merged 17 commits into from
Feb 11, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

notriddle and others added 17 commits February 9, 2023 18:13
@notriddle
rustdoc: clean up write! calls with less stuttering
1a98305
@chenyukang
add only modified for compiletest
414eb48
@matthiaskrgr
remove redundant clones
5201bb5
@chenyukang
cleanup and fix naming
c52435a
@GuillaumeGomez
Correctly handle reexports for macros
c003c01
@GuillaumeGomez
Also get current import attributes
ddb31de
@GuillaumeGomez
Add regression test for reexported macros docs
295fd0d
@notriddle
rustdoc: remove redundant if s.is_empty() from find_testable_code
897647b
@zephaniahong
emit JSON output for building of bootstrap itself
1057e21
@clubby789
rustdoc: Don't resolve link to field on different variant
ef8de38
@matthiaskrgr
Rollup merge of rust-lang#107657 - chenyukang:yukang/add-only-modifie…
585b458 
…d, r=albertlarsan68

Add only modified subcommand for compiletest

r? `@jyn514`

From [discussion](https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/Add.20subcommand.20to.20retest.20all.20tests.20with.20different.20results)
@matthiaskrgr
Rollup merge of rust-lang#107864 - notriddle:notriddle/rustdoc-write-…
240d5e0 
…stutter, r=GuillaumeGomez

rustdoc: clean up `write!` calls with less stuttering
@matthiaskrgr
Rollup merge of rust-lang#107873 - zephaniahong:issue-107832-fix, r=a…
420e756 
…lbertlarsan68

Emit JSON output for the building of bootstrap itself

Fixes rust-lang#107832 .
Main changes are from line 792 onwards. Other changes are due to the flake8 formatter. Let me know if I should not use the formatter.
@matthiaskrgr
Rollup merge of rust-lang#107895 - matthiaskrgr:cl, r=compiler-errors
4b7b569 
remove redundant clones
@matthiaskrgr
Rollup merge of rust-lang#107897 - GuillaumeGomez:reexported-macros-d…
1305119 
…ocs, r=notriddle

Reexported macros docs

Part of rust-lang#59368 (doesn't fix it, only improve the current situation a bit).

Macros were not correctly handled in reexports and the reexport attributes were not merged with the item either. This PR fixes both.

r? `@notriddle`
@matthiaskrgr
Rollup merge of rust-lang#107909 - notriddle:notriddle/register-heade…
f95f68e 
…r-empty-cond, r=camelid

rustdoc: remove redundant `if s.is_empty()` from `find_testable_code`
@matthiaskrgr
Rollup merge of rust-lang#107912 - clubby789:doc-bad-enum-field, r=ca…
c8614a7 
…melid,GuillaumeGomez

rustdoc: Don't resolve link to field on different variant

Fix rust-lang#107903

This also gives a more specific diagnostic when the enum has any fields
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 11, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Feb 11, 2023

📌 Commit c8614a7 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 11, 2023
@bors
Copy link
Collaborator

bors commented Feb 11, 2023

⌛ Testing commit c8614a7 with merge 2b3f260...

@bors
Copy link
Collaborator

bors commented Feb 11, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 2b3f260 to master...

1 similar comment
@bors
Copy link
Collaborator

bors commented Feb 11, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 2b3f260 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 11, 2023
@bors bors merged commit 2b3f260 into rust-lang:master Feb 11, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha

previous master: 2b3f260e74

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rustbot rustbot added this to the 1.69.0 milestone Feb 11, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#107912 c23b89b3606d947ecc9e647a8b04515278c6477d
#107909 be8d8223ee7ba05534af64f626e2a0236d6e8aa7
#107897 57918420e2ef2439012f0ac6116bfa91145de29a
#107895 ce059e911c72739ce3ea57c813af603ab97dfdef
#107873 8afc211a520920e5f960a7230096fc4d442332cb
#107864 4e62ab484ed8123fbcce573bf663cbbe944904b6
#107657 f7481f67524a05037b90640e7a924301ba4cceff

previous master: 8dabf5da9e

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2b3f260): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.5% [0.5%, 0.5%] 1
Regressions ❌
(secondary)		 0.2% [0.2%, 0.3%] 5
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.5% [0.5%, 0.5%] 1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 2.9% [2.9%, 2.9%] 1
Regressions ❌
(secondary)		 1.2% [1.2%, 1.2%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -1.6% [-1.9%, -1.4%] 2
All ❌✅ (primary) 2.9% [2.9%, 2.9%] 1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) - - 0

@matthiaskrgr matthiaskrgr mentioned this pull request Nov 14, 2023
Closed
@matthiaskrgr matthiaskrgr deleted the rollup-qnn380r branch March 16, 2024 18:19
@apiraino apiraino mentioned this pull request Nov 8, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.
9 participants
@matthiaskrgr @bors @rust-timer @rustbot @notriddle @chenyukang @GuillaumeGomez @zephaniahong @clubby789